From b120db85b1d6cfebe61c304c76445f3c4d18d54b Mon Sep 17 00:00:00 2001
From: Romain Francoise <romain@orebokech.com>
Date: Thu, 3 Aug 2006 18:41:58 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9cd42401d29..354e8afeb28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -185,13 +185,8 @@
 
 	* tumme.el (tumme-backward-image): Add prefix argument.  Add error
 	when at first image.
-<<<<<<< ChangeLog
-	(tumme-forward-image): Add prefix argument.
-	Add error when at last image.
-=======
 	(tumme-forward-image): Add prefix argument.  Add error when at last
 	image.
->>>>>>> 1.9899
 
 2006-07-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-- 
2.30.2